Remove references to $(top_srcdir). (gtk.defs,

* gtk/Makefile.am (gdk_headers):
Remove references to $(top_srcdir).
(gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
* gtk/makeenums.pl (parse_entries): Don't look for $srcdir.

diff --git a/ChangeLog b/ChangeLog
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4ffd504e49226a46c2bffccac735215c79ca05d4..79d9c18456a3f744138d4b6c1eb289e8be120017 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gdk_headers): 
+       Remove references to $(top_srcdir). 
+       (gtk.defs, gtktypebuiltins{.h,_vars.c,_ids.c,_evals.c}): Simplify.
+       * gtk/makeenums.pl (parse_entries): Don't look for $srcdir.
+
 Fri Sep 18 19:58:24 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.h (struct _GtkObject): changed gpointer object_data; to

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0374d33981ad85e1607fd6c913eb6b327dace78b..5a394c3f399c90cdde14f09371b1900151b0acab 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -227,44 +227,39 @@ BUILT_SOURCES = \
 
 # More headers to use when autogenerating.
 gdk_headers = \
-       $(top_srcdir)/gdk/gdktypes.h \
-       $(top_srcdir)/gdk/gdkrgb.h
+       ../gdk/gdktypes.h \
+       ../gdk/gdkrgb.h
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
 gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
-       src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%g` ; \
-       srcdir=$(srcdir) \
-         perl $(srcdir)/makeenums.pl defs $$src_headers \
-               $(gdk_headers) > gd.tmp
-       cat $(srcdir)/gtk-boxed.defs >> gd.tmp
-       cp gd.tmp $(srcdir)/gtk.defs
-       rm -f gd.tmp
+       cd $(srcdir) \
+       && perl makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
+       && cat gtk-boxed.defs >> s-gd \
+       && mv s-gd gtk.defs
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
-       awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
-       cp gtb.tmp $(srcdir)/gtktypebuiltins.h
-       rm -f gtb.tmp
+       cd $(srcdir) \
+       && awk -f maketypes.awk gtk.defs macros > s-gtb \
+       && mv s-gtb gtktypebuiltins.h
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
 gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
-       awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
-       cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
-       rm -f gtbv.tmp
+       cd $(srcdir) \
+       && awk -f maketypes.awk gtk.defs variables > s-gtbv \
+       && mv s-gtbv gtktypebuiltins_vars.c
 
 # generate type entries for type-id registration
 gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
-       awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
-       cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
-       rm -f gtbi.tmp
+       cd $(srcdir) \
+       && awk -f maketypes.awk gtk.defs entries > s-gtbi \
+       && mv s-gtbi gtktypebuiltins_ids.c 
 
 # generate enum value arrays
 gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
-       srcdir=$(srcdir) \
-         perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
-               $(top_srcdir)/gdk/gdk*.h > gtbe.tmp
-       cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
-       rm -f gtbe.tmp
+       cd $(srcdir) \
+       && perl makeenums.pl arrays $(source_headers) $(gdk_headers) > s-gtbe \
+       && mv s-gtbe gtktypebuiltins_evals.c
 
 gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
        srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl

diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 0f9d4fcc3d565afc6c82cdb8007dd8a4471f9c2f..194715c42cc2a33798dbf1c02d7c09673e124279 100644 (file)
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -1,7 +1,7 @@
 ;; generated by makeenums.pl  ; -*- scheme -*-
 
 
-; enumerations from "./gtkclist.h"
+; enumerations from "gtkclist.h"
 
 (define-enum GtkCellType
    (empty GTK_CELL_EMPTY)
@@ -10,7 +10,7 @@
    (pixtext GTK_CELL_PIXTEXT)
    (widget GTK_CELL_WIDGET))
 
-; enumerations from "./gtkctree.h"
+; enumerations from "gtkctree.h"
 
 (define-enum GtkCTreePos
    (before GTK_CTREE_POS_BEFORE)
@@ -31,14 +31,14 @@
    (toggle GTK_CTREE_EXPANSION_TOGGLE)
    (toggle-recursive GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE))
 
-; enumerations from "./gtkdebug.h"
+; enumerations from "gtkdebug.h"
 
 (define-flags GtkDebugFlag
    (objects GTK_DEBUG_OBJECTS)
    (misc GTK_DEBUG_MISC)
    (signals GTK_DEBUG_SIGNALS))
 
-; enumerations from "./gtkenums.h"
+; enumerations from "gtkenums.h"
 
 (define-flags GtkAccelFlags
    (visible GTK_ACCEL_VISIBLE)
@@ -231,13 +231,13 @@
    (ascending GTK_SORT_ASCENDING)
    (descending GTK_SORT_DESCENDING))
 
-; enumerations from "./gtkfontsel.h"
+; enumerations from "gtkfontsel.h"
 
 (define-enum GtkFontMetricType
    (ixels-metric PIXELS_METRIC)
    (oints-metric POINTS_METRIC))
 
-; enumerations from "./gtkobject.h"
+; enumerations from "gtkobject.h"
 
 (define-flags GtkObjectFlags
    (destroyed GTK_DESTROYED)
@@ -254,7 +254,7 @@
    (mask GTK_ARG_MASK)
    (readwrite GTK_ARG_READWRITE))
 
-; enumerations from "./gtkpacker.h"
+; enumerations from "gtkpacker.h"
 
 (define-flags GtkPackerOptions
    (expand GTK_PACK_EXPAND)
@@ -286,7 +286,7 @@
    (w GTK_ANCHOR_W)
    (e GTK_ANCHOR_E))
 
-; enumerations from "./gtkprivate.h"
+; enumerations from "gtkprivate.h"
 
 (define-flags GtkPrivateFlags
    (user-style PRIVATE_GTK_USER_STYLE)
@@ -297,7 +297,7 @@
    (has-shape-mask PRIVATE_GTK_HAS_SHAPE_MASK)
    (in-reparent PRIVATE_GTK_IN_REPARENT))
 
-; enumerations from "./gtkprogressbar.h"
+; enumerations from "gtkprogressbar.h"
 
 (define-enum GtkProgressBarStyle
    (continuous GTK_PROGRESS_CONTINUOUS)
@@ -309,7 +309,7 @@
    (bottom-to-top GTK_PROGRESS_BOTTOM_TO_TOP)
    (top-to-bottom GTK_PROGRESS_TOP_TO_BOTTOM))
 
-; enumerations from "./gtkrc.h"
+; enumerations from "gtkrc.h"
 
 (define-enum GtkRcTokenType
    (invalid GTK_RC_TOKEN_INVALID)
@@ -340,7 +340,7 @@
    (highest GTK_RC_TOKEN_HIGHEST)
    (last GTK_RC_TOKEN_LAST))
 
-; enumerations from "./gtkspinbutton.h"
+; enumerations from "gtkspinbutton.h"
 
 (define-enum GtkSpinButtonUpdatePolicy
    (always GTK_UPDATE_ALWAYS)
@@ -355,7 +355,7 @@
    (end GTK_SPIN_END)
    (user-defined GTK_SPIN_USER_DEFINED))
 
-; enumerations from "./gtktoolbar.h"
+; enumerations from "gtktoolbar.h"
 
 (define-enum GtkToolbarChildType
    (space GTK_TOOLBAR_CHILD_SPACE)
@@ -364,13 +364,13 @@
    (radiobutton GTK_TOOLBAR_CHILD_RADIOBUTTON)
    (widget GTK_TOOLBAR_CHILD_WIDGET))
 
-; enumerations from "./gtktree.h"
+; enumerations from "gtktree.h"
 
 (define-enum GtkTreeViewMode
    (line GTK_TREE_VIEW_LINE)
    (item GTK_TREE_VIEW_ITEM))
 
-; enumerations from "./gtktypeutils.h"
+; enumerations from "gtktypeutils.h"
 
 (define-enum GtkFundamentalType
    (invalid GTK_TYPE_INVALID)
@@ -396,7 +396,7 @@
    (foreign GTK_TYPE_FOREIGN)
    (object GTK_TYPE_OBJECT))
 
-; enumerations from "./gtkwidget.h"
+; enumerations from "gtkwidget.h"
 
 (define-flags GtkWidgetFlags
    (toplevel GTK_TOPLEVEL)